Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 9 Jun 2010 11:45:35 +0000 (11:45 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 9 Jun 2010 11:45:35 +0000 (11:45 +0000)
commit75ed815735593d433cba64f92791f94ef7ec16f4
treececeb29db886cc8302655d54b5c1cb9d7d081fca
parent9619b4e86b5c5259a9660a73f82122cb29c723fc
parent6178be5a1824add9bc2862b82ca4b99010375670
Merge from mainline.